Merge from mainline.
authorEli Zaretskii <eliz@gnu.org>
Sat, 13 Feb 2010 13:18:46 +0000 (08:18 -0500)
committerEli Zaretskii <eliz@gnu.org>
Sat, 13 Feb 2010 13:18:46 +0000 (08:18 -0500)

Trivial merge